fix(protocol-designer): TC renders for OT-2 and fix isSlotEmpty logic #14177
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## edge #14177 +/- ##
==========================================
- Coverage 70.40% 70.38% -0.02%
==========================================
Files 2510 2510
Lines 71201 71281 +80
Branches 8971 9010 +39
==========================================
+ Hits 50127 50172 +45
- Misses 18880 18908 +28
- Partials 2194 2201 +7
Flags with carried forward coverage won't be shown. Click here to find out more.
|
jerader
commented
Dec 12, 2023
| @@ -40,6 +40,7 @@ export type OT2AddressableAreaName = | |||
| | '9' | |||
| | '10' | |||
| | '11' | |||
| | '12' | |||
There was a problem hiding this comment.
Spoke to Brent about this and he said that its fine that it'll be merged into edge and not the release branch since no place in the app lists all the addressable areas for the ot-2.
koji
reviewed
Dec 12, 2023
| @@ -39,6 +39,7 @@ import { | |||
| TRASH_BIN_ADAPTER_FIXTURE, | |||
| WASTE_CHUTE_CUTOUT, | |||
| } from '@opentrons/shared-data' | |||
| import { SPAN7_8_10_11_SLOT } from '../../constants' | |||
There was a problem hiding this comment.
nit
Maybe adding _ between SPAN and 7 if the changes wouldn't be a lot.
There was a problem hiding this comment.
this const is used all over unfortunately so i'll just keep it as is. I hope we can deprecate the usage completely at some point.
koji
reviewed
Dec 12, 2023
koji
reviewed
Dec 12, 2023
koji
reviewed
Dec 12, 2023
koji
approved these changes
Dec 12, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes RQA-2062
Overview
Fixes 3 bugs:
Test Plan
Create an OT-2 protocol and add a thermocycler (gen1 or gen 2). Go to the deck map view and see that it renders correctly and that you can add a labware and the 4 slots are considered full. Move the tiprack into another slot and see that slot 1 and 2 are empty and available to add labware into.
Create a move labware step and see in the new location dropdown that slot 12 is not selectable
Changelog
isSlotEmptyutil by mapping the slots to the cutouts and comparing that. the reason why there was an error only with the ot-2 is because the slot would be 1 or 2 and the trash bin is in cutout12, which includes 1 and 2.Review requests
see test plan
Risk assessment
low